it'd be great if you added yarn.lock to .gitignore

[Zorono]

it'd be great if you added yarn.lock to .gitignore... when i try to use git pull after using yarn install it fails and throws error related to conflicting changes and merge requests...

[bsmth]

Thanks for opening this. It's a good practice to commit lock files to repos. This is useful for being explicit about the dependencies that are used in a project.

Most package managers recommend keeping them in SVC:

• https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
• https://docs.npmjs.com/cli/v7/configuring-npm/package-lock-json

About your problem, it's really rare to see conflicts in the yarn.lock unless you're installing some other dependencies on your branch. Try deleting the lock file, then running yarn again.